Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

macro_rules: Remove NtIdent nonterminal token #119412

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

macro_rules: Remove NtIdent nonterminal token #119412

wants to merge 1 commit into from
+269 −267

Conversation

petrochenkov
Copy link
Contributor

@petrochenkov petrochenkov commented Dec 29, 2023 •
edited
Loading

It only exists for keeping the second span (the metavariable span), but after #119673 such spans can be kept using a more general mechanism.

So after this PR spans from ident variables are treated as spans from tt variables.
To avoid regressions, it required migrating some diagnostics in the compiler to the new scheme used to account for tt variables.

This PR should also unblock removal of the uninterpolate stuff from the parser.

Continuation of #119673.

@rustbot
Copy link
Collaborator

rustbot commented Dec 29, 2023

r? @compiler-errors

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 29, 2023
@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 29, 2023
@compiler-errors
Copy link
Member

unassigning myself for now since you said it's a WIP, feel free to reassign when there's stuff to review

@compiler-errors compiler-errors removed their assignment Dec 29, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot
Copy link
Collaborator

rustbot commented Jan 1, 2024

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot
Copy link
Collaborator

rustbot commented Jan 1, 2024

The Miri subtree was changed

cc @rust-lang/miri

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

This comment was marked as resolved.

Sign in to view
@petrochenkov petrochenkov mentioned this pull request Jan 5, 2024
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 6, 2024
@matthiaskrgr
Rollup merge of rust-lang#119624 - petrochenkov:dialoc4, r=compiler-e…
1d6ab69 
…rrors

rustc_span: More consistent span combination operations

Also add more tests for using `tt` in addition to `ident`, and some other minor tweaks, see individual commits.

This is a part of rust-lang#119412 that doesn't yet add side tables for metavariable spans.
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 6, 2024
@rust-timer
Unrolled build for rust-lang#119624
44636ca 
Rollup merge of rust-lang#119624 - petrochenkov:dialoc4, r=compiler-errors

rustc_span: More consistent span combination operations

Also add more tests for using `tt` in addition to `ident`, and some other minor tweaks, see individual commits.

This is a part of rust-lang#119412 that doesn't yet add side tables for metavariable spans.
@bors

This comment was marked as resolved.

Sign in to view
@petrochenkov petrochenkov mentioned this pull request Jan 6, 2024
Merged
@craterbot
Copy link
Collaborator

🎉 Experiment pr-119412-1 is completed!
📊 14 regressed and 5 fixed (474392 total)
📰 Open the full report.

⚠️ If you notice any spurious failure please add them to the blacklist!
ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

@craterbot craterbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-crater Status: Waiting on a crater run to be completed. labels Jun 28, 2024
@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 28, 2024
@petrochenkov
Copy link
Contributor Author

  • mdg.leema.ea189835dd2d248699449839be4aed54ad7cd059 - bare_trait_objects lint + deny(warnings)
  • async-imap-0.9.7 - elided_lifetimes_in_paths lint + deny(rust_2018_idioms)
  • all other regressions are spurious

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@petrochenkov petrochenkov mentioned this pull request Jun 28, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 28, 2024
@bors
Auto merge of rust-lang#127085 - petrochenkov:dialoc6, r=<try>
01df542 
[WIP] Benchmark span combining changes

This is the part of rust-lang#119412 that doesn't include the actual removal of `NtIdent`.
@petrochenkov petrochenkov mentioned this pull request Jun 29, 2024
Open
@petrochenkov
Copy link
Contributor Author

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Sign in to view
@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jun 29, 2024
@bors
Copy link
Contributor

bors commented Jun 29, 2024

⌛ Trying commit d9aa80b with merge 1243fc5...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 29, 2024
@bors
Auto merge of rust-lang#119412 - petrochenkov:dialoc3, r=<try>
1243fc5 
macro_rules: Remove `NtIdent` nonterminal token

It only exists for keeping the second span (the metavariable span), but after rust-lang#119673 such spans can be kept using a more general mechanism.
@bors
Copy link
Contributor

bors commented Jun 29, 2024

☀️ Try build successful - checks-actions
Build commit: 1243fc5 (1243fc549f5262f7c1e3a70c7d45790b52531962)

@rust-timer

This comment has been minimized.

Sign in to view
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (1243fc5): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@bors rollup=never
@rustbot label: -S-waiting-on-perf +perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 2.8% [0.2%, 27.8%] 22
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -0.7% [-0.8%, -0.6%] 6
Improvements ✅
(secondary)		 -1.2% [-1.5%, -0.9%] 8
All ❌✅ (primary) 2.1% [-0.8%, 27.8%] 28

Max RSS (memory usage)

Results (primary 10.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 10.0% [9.9%, 10.0%] 2
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 10.0% [9.9%, 10.0%] 2

Cycles

Results (primary 22.9%, secondary -2.9%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 22.9% [8.8%, 35.1%] 3
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -2.9% [-3.5%, -2.0%] 5
All ❌✅ (primary) 22.9% [8.8%, 35.1%] 3

Binary size

Results (primary -0.2%, secondary -0.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 0.3% [0.3%, 0.4%] 2
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -0.3% [-0.4%, -0.0%] 10
Improvements ✅
(secondary)		 -0.0% [-0.0%, -0.0%] 5
All ❌✅ (primary) -0.2% [-0.4%, 0.4%] 12

Bootstrap: 698.422s -> 697.818s (-0.09%)
Artifact size: 324.47 MiB -> 324.44 MiB (-0.01%)

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jun 29, 2024
@petrochenkov
Copy link
Contributor Author

So the syn anomaly from the old perf run still reproduces, I'll look what happens.

@petrochenkov
Copy link
Contributor Author

I don't understand the syn results at all.

The regression only reproduces in the incr-patched: println scenarions.
For some reason adding that println invalidates insane amount of code, and a large part of typeck and codegen needs to be performed anew.
So the perf diff comes from all parts of the compilation because things needs to be recompiled, and not from some specific place because it's slow.

I'm not sure what to do about this, none of the other crates invalidates this much after adding a println.
The second place is html5ever-0.26.0 with 0.94% regression.

@cjgillot maybe you have some idea what can cause so much recompilation (and how to determine the root cause)?

@petrochenkov
Copy link
Contributor Author

The dependency tracking story for the metavar span table is not clear to me in general.

@petrochenkov
Copy link
Contributor Author

petrochenkov commented Jul 2, 2024 •
edited
Loading

Besides the issue with incremental invalidation in syn this should be ready.
r? @compiler-errors

I migrated some of the clippy lints to the post-#119673 scheme, but not all of them, I can make an issue for that after this is merged.
I should also try to write some guideline for code insertion spans for suggestions, when which span should be used, and when inserting code is unreliable and may result in errors (in progress).

@cjgillot
Copy link
Contributor

cjgillot commented Jul 3, 2024

@petrochenkov I tried to look at the logs from rustc_query_system::dep_graph::graph and to the dumped hir-tree.

The main thing that puzzles me is that we appear to have recompilations due to more HIR changing. I suppose that's due to some spans missing their lower_span call when building HIR. That would be consistent with the effect on a incr-patched println test, which shifts many spans one line down.

This was referenced Jul 3, 2024
Draft
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@compiler-errors compiler-errors

Labels
perf-regression Performance regression. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@petrochenkov @rustbot @compiler-errors @rust-log-analyzer @bors @rust-timer @craterbot @cjgillot